| commit | 14e6683c9ffe288fd03fe38170e3d255056a7841 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Mon Jun 18 18:32:19 2018 |
| committer | Junio C Hamano <gitster@pobox.com> | Mon Jun 18 18:32:19 2018 |
| tree | a3248ef8aa66bb4132fd6442a25d39a151b8173b | |
| parent | 49bcf742a2710071f132cc7efcad8c4f4d7f0984 [diff] [blame] |
Autogenerated HTML docs for v2.18.0-rc2-76-g242ba
diff --git a/git-merge.txt b/git-merge.txt index d5dfd84..6a5c00e 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -57,7 +57,7 @@ discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict. -The fourth syntax ("`git merge --continue`") can only be run after the +The third syntax ("`git merge --continue`") can only be run after the merge has resulted in conflicts. OPTIONS